Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Tue, 22 Nov 2005 16:00:56 +0000 (17:00 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Tue, 22 Nov 2005 16:00:56 +0000 (17:00 +0100)

Trivial merge